fixed autofill