bugfix for #15