Witch hunting against desyncs...

A small pre-emptive strike against possible desync problems.