auto-complete fix - part2