bugfix for #384