Fixed #277 - Prevent sync concurrency

Better not to, it keeps the code clearer.