Added new code to fix row fluid defect