Tried to fix enumeration