sync with last jstar commit

namely, 8c895c8f4349b91b64b4d7f4061edc6e7f5cf6c2