Hotfix: Fixed redirect loop