Fixed JS y jpax
Mergin