Fixed gotcha - enum mapping bug