High Charge still not working propetly

Description of the bug: (optional screenshot/video): Now charge works like rage if you have a cider or a worst pot and you get charged it goes away. The buff stacking fix only made Buccs able to efficiently use HT buff, Energycer, or Apple
What is supposed to happen?: Charge att buff always lets you keep the better buff and would never override any other buff.
Where did you find and/or notice this bug?: By bossing and testing the cider.
A step-by-step guide to re-producing this bug (optional):
Extra information (optional):
I think I rather not have a charge timer display if its going to make Buccs not able to cider properly because as it is now you have to cider between charges and is just not worth it on longer bosses.
Edit: I think this has to do with the skill mask display, if the skill works like a buff it will have the same rule as the rest of the buffs, when it was passive all was ok