bugfix for #0