Bug fix for outgoing messages