Yes, do that.

I also dearly hope you're not going to make the NPCs stay this inept at combat. The fox is starting to cross the line from useful to a burden. I am absolutely sure he should be good at escaping considering his speed.