fix with new status enums
5 files changed