Temporary JS fix