Modified assistant to avoid  for localhost