bugfix issue #7