fixed issues w/ enumerationfields