ModeGenerator minor change