Code migrated to Message is now working.