v6 hotfix f