[WIP] Fixed #277 - Prevent sync concurrency

Does this need a comment?