Fixed infinite recursion bug in auto_* routines