Redirect - Production bug fix