Fixed redundant autofill