issue #97 and #124