LPS-48099 Missed a couple spots