Improve host check