Changed Completer behavior as suggested by stalep