Fix border overflow issue