bugfix resolving issue #7