bugfix for issue #97