This function can only be used after we fix the redirect issue ...