Resovled issue #38