Bugfix issue #107