Fixed issue #163