Manual fix for generation error