Fixed issue #6121 by stopping other saves from happening at the same time
Clean up commit from before