Fixing Redirect issue