Fixing issue with view and client ip being reset