hotfix for 1.9