Fixed CodeGenerator