Fix, add check for already present