Fixed class generation.