enhance auto_set ...again