Fixed possible infinite loop
Updating changelog