bugfix for #57