Fixed evaluation of enums