fixed concurrent problems