Fix little synchronized problem after the merge