fixing generation problems