fix for bug in issue #42 recommited, because of not solvable merge
conflicts