KF Grenades + Switch to last weapon = Void

I know, the grenade counts as a weapon to switch by pressing the command "Throwgrenade" button.

The Switch to last weapon feature has brought me even trough the maddest situations in KF even on HoE. I will provide a simple example:

You have the AA12 + Hunting Shotgun in your inventory.

Your current weapon equipped is the AA12 and your last was Hunting Shotgun.

You start to throw some grenades (= last weapon= Grenades/AA12) and you automatically - in nature - switch back to your AA12.

Pressing the "Switch to last weapon" button won't do anything.

You remain with the AA12 equipped.

Don't like this. I know it's nearly impossible to add an "exception" or "the fact, that Grenades are not weapons" so the game can identify it. I'm a mapper by myself and never realy went into coding.

So what troubles me sometimes is, that I relied on my "Switch to last weapon" button when I (not) few seconds ago tossed my grenade(s).