Adding fix for CSCui62185