issue #258