clip bug fix, benchmark improvement