Fixed always auto bug