bugfix issue #6