Add rematch detection