Bugfix for Issue #35