Fixed issue with items not getting cleared