We should be checking the did and not the name