Fixed host completion to my satisfaction