Fix when a change is in two queues at once