be consistent here.
fix bug - was using message id to access channel map.