FEC-2550

fix shouldEndClip logic