Grunt issues fix