second hotfix fix