LPS-51565 Better performance