Fix recipient id vs. object issue