Bug with clear all feature fixed