Fix issue #258