Border bug fixed