Fix non-clear issue