Fix selection of inputs