Hotfix for autocomplete