Fixing the JS