wip
fix regression
Fix looping