Attempt to fix concurrency issue with stopping/unloading