Fixed clipping issues