upgrades get queued in the same building if the upgrades are not in a sequential list

[DrInfy]

Describe the bug
seems like all upgrades get queued in the same forge if the upgrades are not in a sequential list

To Reproduce
Have enough money for multiple upgrades and have them in BuildOrder

Expected behavior
Only one upgrade is queued

Screenshots