Although my first patch fixes the stated issue, it causes problems for other scenarios. So leave this patch for now and I'll keep looking...
Although my first patch fixes the stated issue, it causes problems for other scenarios. So leave this patch for now and I'll keep looking...