A fix to grant select call - part 2