[In progress: 4] js fix