LPS-47652 Simplest fix
LPS-47652 Simplify