[NGRINDER-697]] Fix bugs