Bugfix issue #16