BasicCompletion enabling fix