hotfix by HT
confirmed
merged hotfix conflict