should be really be in the previous hotfix commit