bugfix for issue #70