fix issue with expandCompletion