Major enumeration bug fix