Fix issue #192