This fix addresses successfully issue #1541 (as already suggested there)
Merge pull request #1543 from markusstoll/fixes2

This fix addresses successfully issue #1541 (as already suggested there)