LPS-50378 fix bad s & r