Fix for enumeration