extreme border bug fixed