Input type fix

Forgot to issue the pull request yesterday. Fixes #2097 

Review @DeepDiver1975 @Raydiation @raghunayyar