Fix the bordering issue