fix: for each template variable check step (#1126)

fix: for each template variable check step (#1126) #440