fixed rescue issue with queuing