LPS-32113 Manual fix