Fix Lock before unlock (1/3)