Fixed enumeration bug