Fixed RT#90667