Clean All First Time bug solved