Fixing clean issue