Fix clear fix issue