PS12042014C Finally fixed code generation class