Fix border view bug