Fix unrolled reader