Fix : Infinite loop avoided