Small bugfix issue #6