Corrected message passing for pre-existing messages