diff --git a/SMCalloutView.m b/SMCalloutView.m
index 5943c50..3e13d37 100755
--- a/SMCalloutView.m
+++ b/SMCalloutView.m
@@ -197,8 +197,10 @@ - (CGFloat)calloutHeight {
 - (CGFloat)calloutContainerHeight {
     if (self.contentView)
         return self.contentView.frameHeight + self.contentViewInset.bottom + self.contentViewInset.top;
-    else if (self.subtitleView || self.subtitle.length > 0)
+    else if (self.subtitle.length > 0)
         return CALLOUT_SUB_DEFAULT_CONTAINER_HEIGHT;
+    else if (self.subtitleView)
+        return CALLOUT_SUB_DEFAULT_CONTAINER_HEIGHT + self.subtitleView.frameHeight - 15;
     else
         return CALLOUT_DEFAULT_CONTAINER_HEIGHT;
 }
diff --git a/SMCalloutView.podspec b/SMCalloutView.podspec
index 76d627a..12178b2 100644
--- a/SMCalloutView.podspec
+++ b/SMCalloutView.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "SMCalloutView"
-  s.version      = "2.1.5"
+  s.version      = "2.1.6"
   s.summary      = "A lightweight callout view class for iOS mimicking UICalloutView."
   s.description  = <<-DESC
                     SMCalloutView aims to be an exact replica of the private UICalloutView system control.