more JS fix