Make MO more resilient