Fixing list nesting