bugfix for #158