[NGRINDER-703]Fix bugs