fixed issue #124