Fix clear flow