fix the HACK when dealing with WhenTrigger data structure.