make a little more resilient