fixing enumerations issue