Fix Lock before unlock (3/3)