Fix missing locks bug