fixed concurrent issues