Fix too many redirects #ashsimmonds