Fix issue #244