fix one-off dequeue mechanism