Fixing second occurance of enumeration bug