Added fix to prevent duplication creation of InputControl
Refactor