fix with new status enums