Enumeration fixed