Fixed bug when there is no border