Added two data handling defects