Bugfix for optional completion