Patch for grant reusing
Merge pull request #339 from calblueprint/patch-up

Patch for grant reusing