Fix completion behavior