Forall generate call fix