Really fix clipping