Fix Completions sometimes not working #6