Fixed #277 - Prevent sync concurrency

@gideonthomas Do you remember why we took this approach?