Further testing of my suggested patch shows it doesn't work in all cases. I'll continue to look at this.
Further testing of my suggested patch shows it doesn't work in all cases. I'll continue to look at this.