implemented js fix