Fixed iceika's generation problem