Trying to fix bugs in read path.