Fix border
Fix border