bugfix for #21