[fix] first bug fix and test batch