Fixes RT#90672