Fix for RT#86896