Add flag to guard against circular events