Hotfix for redirection