Fix endhost