FIX potential issues when multiple communications exist.
FIX potential issues when multiple communications exist.

CompassionCH/compassion-modules,CompassionCH/compassion-modules,CompassionCH/compassion-modules,CompassionCH/compassion-modules