Merged another fix for sync.