Fix bug in logic for determing OP status