JS fix
hot fix
Merge branch 'Testing'