[WIP] Fixed #277 - Prevent sync concurrency

I think this should be moved to 611