gir: get it right