Fixes RT#91007