quickfix, fixed condition where status changes are mixed