Issue #125: proposed fix ...