Fixed duplicate data bugs