fix some bug
support new format