hopefully final hotfix