Fix: issue #34