Possibly fixed issues with invalid reads.