JS workaround for dexy bug and typo fix