bugfix for #13