Clipping problem fix