hotfix, research added