Fix border welcome