a bit more resilient