Merged a change on read_int