Correctly differentiate cancelled unpop from pop