fix issue #161