Fixed automatic stop bug

Removed TODO from mc_run, because it is solved other way.