enum parsing fix, user parsing fix