Workaround to fix redirection