Fix double clip for borders