- JS bug fix