Fix grant subjects