[OE-4448] fix to work with save complex elements