[WIP] Fixed #277 - Prevent sync concurrency

would help