Added host check