fixed enum handling