Fix clipping issue