Fixing issue with non-active inputs