Fixing issues with messages not being processed based on their multiple types.