Resolved issue #38