Fix host handler