Updated Loop Fix