Defect#14508: fixing the fails