Issue #65: refactored synchronization a bit