border bug fixed