LPS-35091 Fix JSPC