Fix grant submission