Bugfix in message_relay