Having had time to look at the previous bug better, this change fixes it up properly. That last fix worked, but was susceptible to another possible issue.