Try to fix xsi:type issue...