Fix AutoGeneration