Merge pull request #263 from retro-wertz/revert-262-fix_input