BHV-10416: simpler code