hotfix for bug 115