[NGRINDER-697] Fix the bugs