introduced new mechanism - infinite loop - (old one was not working anymore)