Fix for sync all