Fixed enum constan generation