issue #244