auto-complete fix - part1