Hotfix for bug #896.