Fix duplicating data