Minor:

- Fix NPC Shauna
Revert this, cid is undefined.