LPS-43589 Make consistent