Fix infinite loop
fix comment