Issue #248: proposed fix