Address issue #124