Fix for CSCul26247