Handle read locks better