Fix incorrect keys being read