Bug fix in scenario pick next; fixes when tracking dependencies between events