Hotfix in sync