cosmetics
fix infinite loop
lupa