loop fixing in progress