Fix edge case with propagate :remove and match_time