issue #161