some attempt to fix the message synchronization