more on #105 and #124