Changed behavior of auto-completion