auto-complete fix - part3