Further fix issue #161