Commit clearrange bug fix