FIX: Prevent the redirect loop from happening!