Issue #126 fixed