Add host$ or guest$ to commands