bugfix for #261