JS hotfix