on_empty_queue callback was still not being handled correctly, I hope it is now!