Critical fix for message synchronization