Fixed up Message server equality