fix for Input.php
fix structure