Merge branch 'fix-no-input'