Potential multiple-enumeration fixed