fixed javascript
fixed javascript
merge