LPS-43587

I think this should do it