Fix border issue