Fix list enumeration