Unreviewed, fix cloop some more.