Hotfix for message analytics