Issue #161 bug fixed