diff --git a/MVMCoreUI/Molecules/Items/MoleculeTableViewCell.swift b/MVMCoreUI/Molecules/Items/MoleculeTableViewCell.swift
index 33229092..75f1f0d8 100644
--- a/MVMCoreUI/Molecules/Items/MoleculeTableViewCell.swift
+++ b/MVMCoreUI/Molecules/Items/MoleculeTableViewCell.swift
@@ -24,6 +24,7 @@ import UIKit
             (molecule as? ModelMoleculeViewProtocol)?.set(with: castModel.molecule, delegateObject, additionalData)
         } else if let moleculeView = MVMCoreUIMoleculeMappingObject.shared()?.createMolecule(castModel.molecule, delegateObject, false) {
             addMolecule(moleculeView)
+            accessibilityElements = [moleculeView]
         }
         super.set(with: model, delegateObject, additionalData)
     }
@@ -37,7 +38,7 @@ import UIKit
         return "\(self)<\(moleculeName)>"
     }
     
-    public class func requiredModules(_ json: [AnyHashable : Any]?, delegateObject: MVMCoreUIDelegateObject?, error: AutoreleasingUnsafeMutablePointer<MVMCoreErrorObject?>?) -> [String]? {
+    public class func requiredModules(_ json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?, error: AutoreleasingUnsafeMutablePointer<MVMCoreErrorObject?>?) -> [String]? {
         guard let moleculeJSON = json?.optionalDictionaryForKey(KeyMolecule),
             let theClass = MVMCoreUIMoleculeMappingObject.shared()?.getMoleculeClass(withJSON: moleculeJSON)
             else { return nil }
diff --git a/MVMCoreUI/Templates/MoleculeListTemplate.swift b/MVMCoreUI/Templates/MoleculeListTemplate.swift
index d68a1170..1db1593b 100644
--- a/MVMCoreUI/Templates/MoleculeListTemplate.swift
+++ b/MVMCoreUI/Templates/MoleculeListTemplate.swift
@@ -215,7 +215,9 @@ open class MoleculeListTemplate: ThreeLayerTableViewController, TemplateProtocol
     func getMoleculeInfo(with listItem: (ListItemModelProtocol & MoleculeModelProtocol)?) -> (identifier: String, class: AnyClass, molecule: ListItemModelProtocol & MoleculeModelProtocol)? {
         
         guard let listItem = listItem,
-            let moleculeClass = MVMCoreUIMoleculeMappingObject.shared()?.getMoleculeClass(listItem) else { return nil }
+            let moleculeClass = MVMCoreUIMoleculeMappingObject.shared()?.getMoleculeClass(listItem)
+            else { return nil }
+        
         let moleculeName = (moleculeClass as? ModelMoleculeViewProtocol.Type)?.nameForReuse(with: listItem, delegateObject() as? MVMCoreUIDelegateObject) ?? listItem.moleculeName
         return (moleculeName, moleculeClass, listItem)
     }