Hotfix for Clear All button