Fix bug related to hostname