Message Passing Fix