Fixing enum mapping.