Input handler fix