LPS-44761 Add the similar logic in other methods.