Quick fix for message synchronization