Fix for RT#86233
Fix for RT#86239
hmmm