Fix auto complete (fixes #8)

Change-Id: I0d6fe2690d0eb26a9364cb13fc871816060db64c