Fixes runtimes of the mechs

Fix #5777
please revert this until you find a proper fix