add late import and fix closure error
Merge pull request #2638 from kived/hidinput-errors-import-closure

add late import and fix closure error