Fix JS error
Merge branch 'develop'