Fix RT#84787