Resolve an infinite loop problem at the DST boundary