This should fix most of our synchronization problems.