correct merge error from host-email branch.