Almost fix the io/ff and partial reads issue