Fixed bug with not waiting for stop to complete