diff --git a/Core/Source/DTTextHTMLElement.m b/Core/Source/DTTextHTMLElement.m
index 290c5974b..63a29d9be 100644
--- a/Core/Source/DTTextHTMLElement.m
+++ b/Core/Source/DTTextHTMLElement.m
@@ -58,14 +58,14 @@ - (NSAttributedString *)attributedStringWithContext:(DTHTMLAttributedStringBuild
 			// useing \r as to not confuse this with line feeds, but still get a single paragraph
 			text = [text stringByReplacingOccurrencesOfString:@"\n" withString:@"\r"];
 		}
-		else if (_containsAppleConvertedSpace)
-		{
-			// replace nbsp; with regular space
-			text = [_text stringByReplacingOccurrencesOfString:UNICODE_NON_BREAKING_SPACE withString:@" "];
-		}
-		else
-		{
-			text = [_text stringByNormalizingWhitespace];
+        else
+        {
+            if (_containsAppleConvertedSpace) {
+                // replace nbsp; with regular space
+                text = [_text stringByReplacingOccurrencesOfString:UNICODE_NON_BREAKING_SPACE withString:@" "];
+            }
+            // normalize white space
+            text = [_text stringByNormalizingWhitespace];
 		}
 		
 		NSDictionary *attributes = [self attributesForAttributedStringRepresentationWithContext:context];
diff --git a/DTCoreText.podspec b/DTCoreText.podspec
index a48eba8da..e1558e917 100644
--- a/DTCoreText.podspec
+++ b/DTCoreText.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
   spec.name         = 'DTCoreText'
-  spec.version      = '3.0.2'
+  spec.version      = '3.1.0-dev'
 
   spec.license      = 'BSD'
   spec.source       = { :git => 'https://github.com/artifacts/DTCoreText.git', :tag => spec.version.to_s }