Bug fix in completions