bugfix issue #11