Nested - Single - None - Embedded Buf Fix