Fix issue #117