Added code for properly reading by values' keys.