Fixed error with autofill