be more careful about host checking