Jarv/retire host fix

sounds great as long as the precedence works like you expect it.