Fixing js issue
Merge branch 'develop'