Fix auto complete

Change-Id: If8989139f228b6fe77b4bc3727b8d926a4c4adf1