Bugfix issue 341