bug fix+ running on a single event only