fix border close #36