Jarv/retire host fix

added