Improve sub clip clipping