Add a hack to extra grant