Small queue handling bugfix