bug fix
Merge branch 'yicheng' of github.com:xuqian/eva-engine into yicheng