Fixed Border Bug