Issue #124: proposed fix