Attempting autocompletion fix