This lock should be gone