v6 hotfix c corrected