Fix location in generator