fixing message passing for subscription modes