[OE-4388] - fix loading bug