Fixing the grunt loop