Fixes issue for redirection bug