fix for ticket #38