add missing 216, make map code more resillient