Fixed bugs with Grunting