Fix data dupes on second call