Final Message Passing Fix