A fix to grant select call