Fixed RT#90683