[WIP] Fixed #277 - Prevent sync concurrency

Why is this coming up in the commit?