Fix clear fields