Try to fix circular loop bug.