Host detection improved