Fixed issue #162