[3.9] Grunt fix