fix js
Merge branch 'fix_js'