#103: Fix double redirects