PLEASE fix Time of Need weapon swap bug? (has existed since launch)

People have reported this bug many times, but it still exists in game.

If you swap weapons between ticks, it extends the duration between ticks, making it almost never tick. If you weapon swap multiple times, it extends it *even more*.

In short: Time of need is USELESS if you weapon swap. This is obviously not intended.

The game is awesome, but PLEASE fix this bug. I really want to play with Time of Need, but every league I find this bug still exists.