Attempt at fixing Pumin NPC's

This is probably not correct anywhere so please give it a thorough check.