Fix for disabling the auto-redirect