Fix issue #161