Fixed border related bug