Bug fix: Locking an expired lock should save data from existing lock