hotfix closes #1385