Bugfix issue #9