really fixed generation bug