fixed missing changes for the new running mode