Fixed Grubb bug