[NGRINDER-594] Fix the bug