#11 loop fix