Fix enumeration again