Fixing host passing issue.