Fix Clean IssueY