Fix clear all function