refs issue #38