Fixed issue with auto complete