Fix javascript bug
Merge branch 'hotfix/javascript_bug'