Fix issue #170