more resilient for SPA's