Fixed a bug with broadcast after message