Fix issue #115