Fix cycles for ANDIXX