Enum Issue Fixed