fixed enum data handler