Fix border