Fixing border issue