fix bug currentElement
Merge branch 'WorkLizzard'