fixed clipping issues