Fixed and tested Enum fixer