Fix behavior of godir