Fix Backward incompatible change in granting API