Redirect issue fix