emergency hotfix for #297