diff --git a/ExpandableCellDemo-ios.xcodeproj/project.pbxproj b/ExpandableCellDemo-ios.xcodeproj/project.pbxproj
index eed10cd..3f6f93c 100644
--- a/ExpandableCellDemo-ios.xcodeproj/project.pbxproj
+++ b/ExpandableCellDemo-ios.xcodeproj/project.pbxproj
@@ -265,7 +265,7 @@
 			inputFileListPaths = (
 			);
 			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-ExpandableCellDemo-ios/Pods-ExpandableCellDemo-ios-frameworks.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-ExpandableCellDemo-ios/Pods-ExpandableCellDemo-ios-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/PinLayout/PinLayout.framework",
 				"${BUILT_PRODUCTS_DIR}/SnapKit/SnapKit.framework",
 				"${BUILT_PRODUCTS_DIR}/TableKit/TableKit.framework",
@@ -280,7 +280,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ExpandableCellDemo-ios/Pods-ExpandableCellDemo-ios-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ExpandableCellDemo-ios/Pods-ExpandableCellDemo-ios-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
diff --git a/ExpandableCellDemo-ios/Cells/Base/BaseTableViewCell.swift b/ExpandableCellDemo-ios/Cells/Base/BaseTableViewCell.swift
index b7e1c9f..eee3619 100644
--- a/ExpandableCellDemo-ios/Cells/Base/BaseTableViewCell.swift
+++ b/ExpandableCellDemo-ios/Cells/Base/BaseTableViewCell.swift
@@ -33,7 +33,6 @@ class BaseTableViewCell: UITableViewCell {
         clipsToBounds = true
 
         label.numberOfLines = 0
-        label.preferredMaxLayoutWidth = UIScreen.main.bounds.width - 2 * BaseTableViewCell.textMargin
 
         collapsedView.addSubview(indexLabel)
         containerView.addSubview(collapsedView)
@@ -42,6 +41,12 @@ class BaseTableViewCell: UITableViewCell {
 
         initializeView()
     }
+    
+    override func layoutSubviews() {
+        super.layoutSubviews()
+
+        label.preferredMaxLayoutWidth = contentView.frame.width - 2 * BaseTableViewCell.textMargin
+    }
 
     required init?(coder aDecoder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
diff --git a/ExpandableCellDemo-ios/Cells/ExpandableAutolayoutCell.swift b/ExpandableCellDemo-ios/Cells/ExpandableAutolayoutCell.swift
index 1ff6abf..ee374c0 100644
--- a/ExpandableCellDemo-ios/Cells/ExpandableAutolayoutCell.swift
+++ b/ExpandableCellDemo-ios/Cells/ExpandableAutolayoutCell.swift
@@ -1,7 +1,7 @@
 import SnapKit
 import TableKit
 
-class ExpandableAutolayoutCell: BaseTableViewCell, ConfigurableCell, Expandable {
+final class ExpandableAutolayoutCell: BaseTableViewCell, ConfigurableCell, Expandable {
 
     // MARK: - Init
 
diff --git a/ExpandableCellDemo-ios/Cells/ExpandableManualLayoutCell.swift b/ExpandableCellDemo-ios/Cells/ExpandableManualLayoutCell.swift
index 3e61df6..7529517 100644
--- a/ExpandableCellDemo-ios/Cells/ExpandableManualLayoutCell.swift
+++ b/ExpandableCellDemo-ios/Cells/ExpandableManualLayoutCell.swift
@@ -1,6 +1,6 @@
 import TableKit
 
-class ExpandableManualLayoutCell: BaseTableViewCell, ConfigurableCell, Expandable {
+final class ExpandableManualLayoutCell: BaseTableViewCell, ConfigurableCell, Expandable {
 
     // MARK: - Init
 
diff --git a/ExpandableCellDemo-ios/Cells/ExpandablePinLayoutCell.swift b/ExpandableCellDemo-ios/Cells/ExpandablePinLayoutCell.swift
index 3e4bed9..f68756f 100644
--- a/ExpandableCellDemo-ios/Cells/ExpandablePinLayoutCell.swift
+++ b/ExpandableCellDemo-ios/Cells/ExpandablePinLayoutCell.swift
@@ -1,7 +1,7 @@
 import TableKit
 import PinLayout
 
-class ExpandablePinLayoutCell: BaseTableViewCell, ConfigurableCell, Expandable {
+final class ExpandablePinLayoutCell: BaseTableViewCell, ConfigurableCell, Expandable {
 
     // MARK: - Init
 
diff --git a/Podfile.lock b/Podfile.lock
index 8752a2f..a0e17b8 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -30,4 +30,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 6b497b1c0f4030ade5783db0b837662f14759131
 
-COCOAPODS: 1.5.3
+COCOAPODS: 1.6.0.beta.2