Fix: issue #258