Fixing for different root message types