LPS-32620 [Quick Fix]