BZ1073001 - Advanced enumeration stopped working