Issue #79 fixed