LPS-45779 Do not use fields if not necessary