[NGRINDER-678]Fix the bugs