Better fix for nested lists