2.2 also needs the queue fix