Border fix