combine_v3.1
fix some bug