Fix cycles