Fix for message synchronization compatibility