Proposed fix: [e0b5b5cbd2] (for Tcl 8.5)