I'd rather add this fix on top of your latest changes + my latest spark additions (would avoid the t.table vs. t.parent and possibly other weirdness)