Fixed a problem with graceful redirects