Slight fix to code generation