Fixed InputHandler