For the record, we ran into the same problem on our upgrade. And, this fixed it.

Thanks!

Neil