SafeEnum fix