message-routing bugfixing