Issue #176 fixed