Bugfix issue #7