Sync - Fixed issue #6