Fix edge case for removal of match by time