Upgrade autocomplete to fix #3242