Fixed multiple child nesting issues