Fix wrong hostname issue, closes #6