Fix reader innefficiency