Generic Reader:  fix bugs