Restored batch mode safe guard