Please fix combat with the bow.

My biggest gripe with the combat and especially dealing with bosses constantly jumping/teleporting out of melee range is that it is not smooth at all to mix the bow in with combat for ranged attacks.

When weapons are drawn and you switch to the bow when Kliff puts the bow away he switches back to whatever two handed weapon or TOOL he has equipped at the time.

So if you mainly use a two handed weapon then it probably isnt a big deal but if you dual wield or go shield and sword like me who doesn't even keep a 2 handed weapon in their inventory then whenever the bow is put away it will switch to your tool.

I was fighting that dumb spider and kept shooting it when it jumped away and felt like I kept getting hit by everything and couldn't block anything or attack it, I even reloaded my save cuz I thought the game was glitching. But no whenever I shot my bow Kliff would bring out my Fucking SHOVEL!

I WAS TRYING TO BLOCK AND I WAS AIMING WITH MY SHOVEL.

Please patch this so when in combat and Kliff puts his bow away he switches back to whatever previous weapon he was using.