Fixes RT#90658