Nested row fix