Thunder Paw: Crash fix

Crash fix