Fixed auto completion