Fixed GenerationHandler.