Jarv/retire host fix