Fix issue #167