[OE-3410] bug fix