- Fix js issue