issue #124 and #125