LPS-39486

Alternative solution