FIX THE BORDER !