Fix inputs issue