fixing code generation hick-up