Fixes runtimes of the mechs

Fix #5777
Merge pull request #5991 from Razharas/MechClick

Fixes runtimes of the mechs