Added the border fix