Make even more resilient