bug #38 fix