LPS-45426 Infinite loop when updating structure with sub structure