fix border issue