Container clear issue handled