Fixed clear issue