some fix for auto-complete