Make Input accessible
Remove an obsolete condition
Make Input accessible