Fixed bug when a handler queues more handlers