Dealt with the nullable enum issue