Issue #123 fixed