Fix: issue #139