Fix for InputHandler