JS fixed