When you upgrade tiamat the upgraded item should be placed in tiamat's spot

I just lost a game because of this. It was late game, enemy was invading the base and I quickly upgrade my tiamat to hydra and buy a commencing GA. When I go in to fight I use my normal tiamat combo and what do you know, I pop my commencing GA randomly and the crucial kill slips away and I get ? pinged because for whatever reason when you upgrade a tiamat item the game puts it in a different spot in your inventory.__

Please make it so tiamat upgrades stay in the same place as tiamat was when you buy them. Actually, make it so that any active item that gets upgraded keeps the spot of the component with the active. Thank you.