Bugfix issue #4