Update autoenv to remove infinite loop