Fix (temporarily) what is run and when