OP-1379 - Queue handling logic had still flaws :(