Fixed more serious clipping issues