(Joyce) Fix infinite redirect?