Fix regression
Add limit condition