fix finding the used in the message_gateway