Fixed issue where names are repeated.