Fixed issue #161

Fixed issue #161