bugfix-hostnames-with-spaces