Fixed hostnames saving