Fixes runtimes of the mechs

Fix #5777