Issue #59 fixed