05281524_fix some issue