improvements to previous hotfix