Fix issue #168