Fix grant bug for real