LPS-46920 - maybe fix?