[OE-2716] legacy method