Extended tests and found fix for Issue #238

I created a test for the Issue #238 and could find the problem, but not thanks the test... ;-)