Fixed issue #161