Fix issue #175