Fixed issue #170