Fix to ensure that the grants are applied as expected