Bug fix: do the same than for inputs: use only 1 set