bugfix issue #3