Fix for Concurrency issues

Fixed save problem due to concurrency