Issue #86 fixed