added possibility to disable automatic triggering of completion