Fix issue with auto completion