LPS-32064 Use different escape method