!79 codecheck fix
Merge pull request !79 from duanhan/1022_codecheck_fix