Fix for CSCuo57525