Fix of the JS fix