Fix bareHost replace