Fixed issue with no queue for stop or queue for record