[NOBTS] Make a patch for grinder 3.9 bug