Fixing host mapping issue