Added queue draining on stop