Issue #121 fixed