a more correct fix for the autofill problem