hotfix for bug #32