+ bugfix for #19