Fix Lock before unlock (2/3)