Fixed autocomplete issue #68