Fixed remote host and case condition

Change-Id: I57acbac9455dd2eac499c21ff0c5bdeb4234923a