Merge pull request #2188 from arian/fix-2178-set-input-type