addressed issue #38