Code generator fix