UI clear bug fix