Fix address reference back to consumer