Realy fix the datarace