Fixed some erroneous redirecting