Fixed the buggy generator. Supposedly not buggy anymore