Wrong queue would be selected in multi-queue mode

Thx to jesper for the spot