Fix to allow list of inputs