OK, really fix the JS this time...