Fix issue #124