convert to js to that it works
Merge commit '7220f967ba07448bcc06d84e2fbfec492b20da4c'