Bugfix issue #10