Fixed autocompletation bug