LPS-49294 Part 4

Fixed, sorry