Message passing issues resolved