Integrate fix for ticket #10