Issue #181 fixed