[NGRINDER-717] Fix the bug