made more resilient to pocket errors