Refactoring input connection.
Regression fix for refactored connection.