Fix in windows live code. Need to join...