Fix code regeneration issue