diff --git a/readme.txt b/readme.txt
index 9c6e56c..127c319 100644
--- a/readme.txt
+++ b/readme.txt
@@ -4,7 +4,7 @@ Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_i
 Tags: cache, page cache, full page cache, nginx, memcached, apc, speed
 Requires at least: 3.0
 Tested up to: 3.5.2
-Stable tag: 1.2
+Stable tag: 1.2.1
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 
@@ -87,6 +87,13 @@ Please post feature requests to [WP-FFPC feature request topic](http://wordpress
 
 == Changelog ==
 
+= 1.2.1 =
+*2013-07-23"
+
+What's fixed:
+
+* call to undefined function get_blog_option error fixed
+
 = 1.2 =
 *2013-07-17*
 
diff --git a/wp-common b/wp-common
index 7dd47c2..3f1571d 160000
--- a/wp-common
+++ b/wp-common
@@ -1 +1 @@
-Subproject commit 7dd47c2aee035282c090b2479e3019338758b3b4
+Subproject commit 3f1571dac3eeea09b0c6cfadb9616bb301d3bcf5
diff --git a/wp-ffpc-class.php b/wp-ffpc-class.php
index 9dbc38a..ab3ec9a 100644
--- a/wp-ffpc-class.php
+++ b/wp-ffpc-class.php
@@ -1075,7 +1075,7 @@ if ( ! class_exists( 'WP_FFPC' ) ) {
 				$current_blog = get_current_blog_id();
 				switch_to_blog( $site );
 
-				$url = $this->_site_url();
+				$url = $this->_site_url( $site );
 				//$url = get_blog_option ( $site, 'siteurl' );
 				if ( substr( $url, -1) !== '/' )
 					$url = $url . '/';
@@ -1115,7 +1115,7 @@ if ( ! class_exists( 'WP_FFPC' ) ) {
 				}
 
 				/* in case the bloglinks are relative links add the base url, site specific */
-				$baseurl = $this->_site_url();
+				$baseurl = empty( $url ) ? $this->_site_url() : $url;
 				if ( !strstr( $permalink, $baseurl ) ) {
 					$permalink = $baseurl . $permalink;
 				}