3.3 Redirect issue fix