Bugfix issue #5