Avoid clipping issues during animation