Possible fix for autocomplete problem