issue #124 fixed