Issue #82 fixed