Fix for CSCuj70908