Fixed next, and grants without any other changes

Signed-off-by: hajee <hajee@moretIA.com>