LPS-41326

I'm not quite sure this is the correct way of fixing this, but here you go.