bugfix for #221