Add fixes by second-to-last reader