Fix completion, return entire item