Fix: issue #2