git issue #161