Fixed list nesting issue