bugfix for issue #3