Missed a mutex point, simplify into common method