<hotfix> C6