bugfix #34, regression + testcase