NPC Click Methods Fixed #2

Attempt #2